mbe: Rework diagnostics for metavariable expressions #142950
Open
+259
−134
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
A-tidy
|
There are changes to the cc @jieyouxu |
petrochenkov
added
S-waiting-on-author
tgross35
changed the title
|
I split the nonfunctional changes here to a new PR, #143245. I think this should make it a bit more straightforward to do the other changes here. |
rustbot
added
S-blocked
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jul 1, 2025
…ation, r=petrochenkov mbe: Add tests and restructure metavariable expressions Add tests that show better diagnostics, and factor `concat` handling to a separate function. Each commit message has further details. This performs the nonfunctional perparation for further changes such as rust-lang#142950 and rust-lang#142975 .
|
@rustbot author |
rustbot
added
S-waiting-on-author
|
Reminder, once the PR becomes ready for a review, use |
rust-timer
added a commit
that referenced
this pull request
Jul 1, 2025
Rollup merge of #143245 - tgross35:metavariable-expr-organization, r=petrochenkov mbe: Add tests and restructure metavariable expressions Add tests that show better diagnostics, and factor `concat` handling to a separate function. Each commit message has further details. This performs the nonfunctional perparation for further changes such as #142950 and #142975 .
This comment was marked as resolved.
This comment was marked as resolved.
tgross35
force-pushed
the
metavariable-expr-rework
branch
2 times, most recently
from
51693ef to
1146773
Compare
This comment has been minimized.
This comment has been minimized.
tgross35
force-pushed
the
metavariable-expr-rework
branch
3 times, most recently
from
13a7e49 to
7e5760b
Compare
tgross35
force-pushed
the
metavariable-expr-rework
branch
from
7e5760b to
5366b37
Compare
rustbot
added
S-waiting-on-review
tgross35
force-pushed
the
metavariable-expr-rework
branch
from
5366b37 to
b276ff8
Compare
petrochenkov
reviewed
Jul 9, 2025
| } | ||
|
|
||
| /// Map of `(name, max_arg_count, variable_count)`. | ||
| const EXPR_NAME_ARG_MAP: &[(&str, ArgSpec)] = &[ |
There was a problem hiding this comment.
This is only used once, probably better to turn it into a match on strings.
| ]; | ||
|
|
||
| /// List of the above for diagnostics | ||
| const VALID_METAVAR_EXPR_NAMES: &str = "`count`, `ignore`, `index`, `len`, and `concat`"; |
There was a problem hiding this comment.
This is also only used once.
|
r=me with the comments addressed. |
rustbot
added
S-waiting-on-author
Give a more user-friendly diagnostic about the following:
* Trailing tokens within braces, e.g. `${foo() extra}`
* Missing parentheses, e.g. `${foo}`
* Incorrect number of arguments, with a hint about correct usage.
Change to a structural diagnostic, update the valid list, and move the valid list to a note.
tgross35
force-pushed
the
metavariable-expr-rework
branch
from
b276ff8 to
dff37db
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Make the diagnostics for metavariable expressions more user-friendly. This mostly addresses syntactic errors; I will be following up with improvements to
concat(..).r? @petrochenkov